fix(server): align call_tool result shapes#2830
Open
he-yufeng wants to merge 1 commit into
Open
Conversation
Author
|
I checked the remaining red matrix job. It is checks / test (3.13, lowest-direct, ubuntu-latest), failing in ests/issues/test_1363_race_condition_streamable_http.py::test_race_condition_invalid_accept_headers with RuntimeError: Task group is not initialized. Make sure to use run().\n\nThis PR only narrows MCPServer.call_tool result typing and updates the corresponding focused tests; the failure is in the streamable HTTP race-condition test path and the aggregate �ll-green job is passing. I am treating it as unrelated to this change unless maintainers see a connection I missed. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
MCPServer._handle_call_toolMCPServer.call_toolwith the result shapes actually returned by the tool managerCallToolResultreturns and unstructured content-block returnsFixes #2695
To verify
uv run --frozen pytest tests\interaction\mcpserver\test_tools.py::test_tool_returning_call_tool_result_passes_through tests\interaction\mcpserver\test_tools.py::test_tool_without_output_schema_returns_unstructured_content tests\interaction\mcpserver\test_tools.py::test_call_tool_model_return_becomes_structured_content tests\server\mcpserver\test_server.py::TestServer::test_call_tool_return_annotation_lists_reachable_shapes -quv run --frozen pytest tests\interaction\test_coverage.py -quv run --frozen ruff check src\mcp\server\mcpserver\server.py tests\interaction\mcpserver\test_tools.py tests\interaction\_requirements.py tests\server\mcpserver\test_server.pyuv run --frozen pyright src\mcp\server\mcpserver\server.py tests\interaction\mcpserver\test_tools.py tests\interaction\_requirements.py tests\server\mcpserver\test_server.pygit diff --check